Adds support for module runtime cycles. Test: existing tests Change-Id: I0b2901b432eb0915ece62c72909a2748c140db8b
diff --git a/adt-branding/BUILD b/adt-branding/BUILD index d681ee6..c8938a0 100644 --- a/adt-branding/BUILD +++ b/adt-branding/BUILD
@@ -6,12 +6,28 @@ bundle_data = glob(["**"]), iml_files = ["adt-branding.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:testExtensions", + "//tools/idea:external-system-impl", + "//tools/idea:execution-impl", + ], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:xdebugger-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:lvcs-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/util[module]", "//tools/idea/platform/platform-api[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:lang-impl[module]", "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:xml[module]", ], )
diff --git a/adt-testutils/BUILD b/adt-testutils/BUILD index e536c01..91ecae4 100644 --- a/adt-testutils/BUILD +++ b/adt-testutils/BUILD
@@ -5,11 +5,30 @@ srcs = ["src/main/java"], iml_files = ["adt-testutils.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/annotations[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/base/testutils:studio.testutils[module]", "//tools/base/repository:studio.repository[module]", "//tools/idea/.idea/libraries:JUnit4",
diff --git a/adt-testutils/src/main/java/com/android/tools/tests/IdeaTestSuiteBase.java b/adt-testutils/src/main/java/com/android/tools/tests/IdeaTestSuiteBase.java index d080a84..f7cc84e 100644 --- a/adt-testutils/src/main/java/com/android/tools/tests/IdeaTestSuiteBase.java +++ b/adt-testutils/src/main/java/com/android/tools/tests/IdeaTestSuiteBase.java
@@ -106,10 +106,13 @@ try { for (String target : targets) { File file = new File(TestUtils.getWorkspaceRoot(), target); - if (!file.exists() && !ignoreMissing) { - throw new IllegalStateException("Cannot symlink to idea home: " + target); - } else { - System.err.println("Ignoring missing directory to symlink to idea home: " + target); + if (!file.exists()) { + if (!ignoreMissing) { + throw new IllegalStateException("Cannot symlink to idea home: " + target); + } + else { + System.err.println("Ignoring missing directory to symlink to idea home: " + target); + } } Path targetPath = file.toPath(); Path linkName = Paths.get(TMP_DIR, target); diff --git a/adt-ui/BUILD b/adt-ui/BUILD index 393b75a..86d1c07 100644 --- a/adt-ui/BUILD +++ b/adt-ui/BUILD
@@ -8,20 +8,40 @@ tags = ["managed"], test_class = "com.android.tools.adtui.AdtUiTestSuite", test_resources = ["src/test/resources"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["src/test/java"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/annotations[module]", "//tools/idea/.idea/libraries:Trove4j", "//tools/idea/platform/platform-api[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/idea/.idea/libraries:JUnit4[test]", "//tools/base/common:studio.common[module]", "//tools/idea/.idea/libraries:truth[test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:mockito", "//tools/adt/idea/adt-ui-model[module]", + "//tools/idea:testFramework[module, test]", "//tools/idea/.idea/libraries:jcip", "//tools/adt/idea/observable[module]", "//tools/adt/idea/adt-ui/lib:libwebp",
diff --git a/android-adb/BUILD b/android-adb/BUILD index 3cca866..4d28484 100644 --- a/android-adb/BUILD +++ b/android-adb/BUILD
@@ -24,13 +24,29 @@ tags = ["managed"], test_class = "com.android.tools.idea.adb.AndroidAdbTestSuite", test_data = ["//prebuilts/studio/sdk:platform-tools"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ "//tools/adt/idea/android-adb[module, test]", "//tools/base/ddmlib:studio.ddmlib[module, test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:truth[test]", "//tools/adt/idea/adt-testutils[module, test]",
diff --git a/android-common/BUILD b/android-common/BUILD index 0bfb70d..26e2cab 100644 --- a/android-common/BUILD +++ b/android-common/BUILD
@@ -10,9 +10,28 @@ "//tools/adt/idea/adt-ui/lib/libwebp", "//tools/adt/idea/artwork:device-art-resources", ], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["test"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/base/common:studio.common[module]", "//tools/idea/platform/util[module]", @@ -23,7 +42,7 @@ "//tools/base/layoutlib-api:studio.layoutlib-api[module]", "//tools/adt/idea/adt-ui[module]", "//tools/base/testutils:studio.testutils[module, test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module, test]", "//tools/base/ninepatch:studio.ninepatch[module]", "//tools/base/sdklib:studio.sdklib[module]", "//tools/base/flags:studio.flags[module]",
diff --git a/android-debuggers/BUILD b/android-debuggers/BUILD index 1ba4065..d703489 100644 --- a/android-debuggers/BUILD +++ b/android-debuggers/BUILD
@@ -5,8 +5,27 @@ srcs = ["src"], iml_files = ["android-debuggers.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/platform-api[module]", "//tools/idea/.idea/libraries:KotlinJavaRuntime", @@ -22,18 +41,25 @@ iml_files = ["android-debuggers-tests.iml"], tags = ["managed"], test_class = "com.android.tools.idea.debuggers.AndroidDebuggersTestSuite", + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:json", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], + runtime_deps = ["//tools/idea/.idea/libraries:sqlite"], # do not sort: must match IML order deps = [ "//tools/adt/idea/android-debuggers[module, test]", "//tools/adt/idea/android-adb[module, test]", "//tools/idea/.idea/libraries:truth[test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", "//tools/adt/idea/android-test-framework[module, test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:kotlin-stdlib-jre8[test]", - "//tools/idea/.idea/libraries:sqlite", "//tools/adt/idea/adt-testutils[module, test]", ], )
diff --git a/android-gradle-jps/BUILD b/android-gradle-jps/BUILD index 7bd93d7..5d135c5 100644 --- a/android-gradle-jps/BUILD +++ b/android-gradle-jps/BUILD
@@ -5,9 +5,29 @@ srcs = ["src"], iml_files = ["android-gradle-jps.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea/java/java-runtime", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/jps/jps-builders[module]", "//tools/idea/jps/model-api:jps-model-api[module]",
diff --git a/android-lang/BUILD b/android-lang/BUILD index e281458..7c07627 100644 --- a/android-lang/BUILD +++ b/android-lang/BUILD
@@ -10,14 +10,34 @@ ], iml_files = ["android-lang.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:testExtensions", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:images", + ], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:xml-analysis-impl", + "//tools/idea:xdebugger-impl", + "//tools/idea:dom-openapi", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:dom-impl", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + "//tools/idea:lvcs-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/core-api[module]", "//tools/base/common:studio.common[module]", "//tools/adt/idea/artwork[module]", "//tools/idea:java-analysis-impl[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:lang-impl[module]", "//tools/idea/.idea/libraries:KotlinJavaRuntime", "//tools/idea/.idea/libraries:Guava", "//tools/idea/uast/uast-common[module]", @@ -31,18 +51,33 @@ tags = ["managed"], test_class = "com.android.tools.idea.lang.AndroidLangTestSuite", test_data = glob(["testData/**"]) + ["//tools/idea/java/mockJDK-1.7"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:testExtensions", + "//tools/idea:external-system-impl", + "//tools/idea:execution-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea/plugins/IntelliLang:IntelliLang-java", + "//tools/idea/plugins/IntelliLang:IntelliLang-xml", + "//tools/idea/uast/uast-java", + "//tools/idea:xdebugger-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:lvcs-impl", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/android-lang[module, test]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:Guava[test]", "//tools/idea/.idea/libraries:truth[test]", "//tools/adt/idea/adt-testutils[module, test]", - "//tools/idea/plugins/IntelliLang:IntelliLang-java[module]", - "//tools/idea/plugins/IntelliLang:IntelliLang-xml[module]", - "//tools/idea/uast/uast-java[module]", ], )
diff --git a/android-plugin/BUILD b/android-plugin/BUILD index 5525039..5f544dc 100644 --- a/android-plugin/BUILD +++ b/android-plugin/BUILD
@@ -7,6 +7,14 @@ tags = ["managed"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/android[module]", "//tools/adt/idea/android-adb[module]",
diff --git a/android-test-framework/BUILD b/android-test-framework/BUILD index adb0710..bd5261c 100644 --- a/android-test-framework/BUILD +++ b/android-test-framework/BUILD
@@ -4,18 +4,30 @@ name = "android-test-framework", iml_files = ["android-test-framework.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:json", + "//tools/idea/plugins/maven:maven2-server-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", "//tools/idea/xml/xml-psi-api[module, test]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/adt/idea/android[module, test]", "//tools/adt/idea/android-common[module]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:truth[test]", "//tools/idea/.idea/libraries:jsr305[test]", + "//tools/idea:dom-openapi[module, test]", "//tools/adt/idea/adt-ui[module, test]", "//tools/idea/.idea/libraries:mockito[test]", ],
diff --git a/android-uitests/BUILD b/android-uitests/BUILD index b5d0cd7..d2fd9c1 100644 --- a/android-uitests/BUILD +++ b/android-uitests/BUILD
@@ -4,9 +4,12 @@ name = "android-uitests", iml_files = ["android-uitests.iml"], tags = ["managed"], + # do not sort: must match IML order test_runtime_deps = [ - "//tools/idea/platform/platform-main", - "//tools/adt/idea/adt-branding", + "//tools/idea:credential-store", + "//tools/idea/plugins/maven:maven2-server-impl", + "//tools/vendor/intellij/cidr:doxygen", + "//tools/idea/jps/javac-ref-scanner-8", ], test_srcs = ["testSrc"], test_tags = ["manual"], @@ -31,7 +34,8 @@ "//tools/idea/plugins/gradle[module, test]", "//tools/idea/java/compiler/openapi:compiler-openapi[module, test]", "//tools/idea:java-impl[module, test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:dom-openapi[module, test]", + "//tools/idea:xdebugger-impl[module, test]", "//tools/adt/idea/designer[module, test]", "//tools/base/flags:studio.flags[module, test]", "//tools/analytics-library/shared:analytics-shared[module]",
diff --git a/android/BUILD b/android/BUILD index 4057986..910819d 100644 --- a/android/BUILD +++ b/android/BUILD
@@ -25,14 +25,26 @@ # do not sort: must match IML order exports = ["//tools/adt/idea/build-common"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/java/openapi[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:dom-openapi[module]", + "//tools/idea:execution-impl[module]", + "//tools/idea:dom-impl[module]", "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:xml[module]", + "//tools/idea:xdebugger-impl[module]", "//tools/idea/java/execution/openapi:execution-openapi[module]", "//tools/idea/platform/smRunner[module]", "//tools/idea/plugins/junit[module]", - "//tools/idea/plugins/maven:maven_and_others[module]", + "//tools/idea/plugins/maven[module]", "//tools/idea:java-impl[module]", "//tools/idea/plugins/properties[module]", "//tools/idea/.idea/libraries:xpp3-1.1.4-min", @@ -42,9 +54,11 @@ "//tools/adt/idea/rt:android-rt[module]", "//tools/idea/java/java-indexing-api[module]", "//tools/idea/jps/jps-builders[module]", + "//tools/idea:spellchecker[module]", "//tools/base/draw9patch:studio.draw9patch[module]", "//tools/base/build-system:studio.manifest-merger[module]", "//tools/idea/.idea/libraries:freemarker-2.3.20", + "//tools/idea:images[module]", "//tools/idea/platform/platform-api[module]", "//tools/idea/plugins/eclipse[module]", "//tools/idea/platform/external-system-api[module]", @@ -68,6 +82,7 @@ "//tools/data-binding:studio.baseLibrary[module]", "//tools/data-binding:studio.compilerCommon[module]", "//tools/data-binding:studio.compiler[module]", + "//tools/idea:external-system-impl[module]", "//tools/idea/.idea/libraries:Gradle", "//tools/idea/plugins/gradle[module]", "//tools/adt/idea/layoutlib[module]", @@ -145,6 +160,13 @@ "//tools/idea/java/jdkAnnotations", "//tools/idea/java/mockJDK-1.7", ], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:json", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], test_shard_count = 8, test_srcs = ["testSrc"], test_tags = [ @@ -158,17 +180,21 @@ visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:lang-impl[module, test]", + "//tools/idea:testFramework[module, test]", "//tools/adt/idea/android[module, test]", + "//tools/idea:spellchecker[module, test]", "//tools/idea/xml/xml-psi-api[module, test]", "//tools/adt/idea/adt-ui[module, test]", "//tools/adt/idea/adt-ui-model[module, test]", "//tools/idea/.idea/libraries:mockito[test]", "//tools/idea/.idea/libraries:truth[test]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:compiler-impl_and_others[module, test]", + "//tools/idea:dom-impl[module, test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/analytics-library/protos:analytics-protos[module, test]", "//tools/idea/.idea/libraries:freemarker-2.3.20[test]", + "//tools/idea:external-system-impl[module, test]", "//tools/idea/plugins/gradle/lib:gradle-base-services-3.2[test]", "//tools/idea/plugins/gradle/lib:gradle-model-groovy-3.2[test]", "//tools/idea/plugins/gradle/lib:gradle-wrapper-3.2[test]", @@ -179,14 +205,18 @@ "//tools/idea/plugins/gradle/tooling-extension-api:gradle-tooling-extension-api[module, test]", "//tools/base/build-system:studio.manifest-merger[module, test]", "//tools/idea/.idea/libraries:Eclipse[test]", + "//tools/idea:xml-psi-impl[module, test]", + "//tools/idea:xml[module, test]", "//tools/idea/plugins/gradle[module, test]", "//tools/idea/plugins/gradle:gradle-tests[module, test]", "//tools/idea/plugins/groovy/groovy-psi[module, test]", "//tools/adt/idea/layoutlib[module, test]", "//tools/idea/plugins/properties/properties-psi-api[module, test]", "//tools/base/instant-run:studio.instant-run-client[module, test]", + "//tools/idea:diff-impl[module, test]", "//tools/idea/.idea/libraries:dexlib2[test]", "//tools/idea/plugins/junit[module, test]", + "//tools/idea:execution-impl[module, test]", "//tools/adt/idea/android-test-framework[module, test]", "//tools/idea/.idea/libraries:jsr305[test]", "//tools/analytics-library/shared:analytics-shared[module, test]", @@ -206,6 +236,7 @@ "//tools/idea/plugins/properties/properties-psi-impl[module, test]", "//tools/adt/idea/artwork[module, test]", "//tools/adt/idea/android-common[module, test]", + "//tools/idea:images[module, test]", "//tools/adt/idea/apkanalyzer[module, test]", "//tools/idea/.idea/libraries:sqlite[test]", "//tools/adt/idea/project-system[module, test]",
diff --git a/apkanalyzer/BUILD b/apkanalyzer/BUILD index c9609b0..1adfb4f 100644 --- a/apkanalyzer/BUILD +++ b/apkanalyzer/BUILD
@@ -5,14 +5,28 @@ srcs = ["src"], iml_files = ["apkanalyzer.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:testExtensions", + "//tools/idea:external-system-impl", + "//tools/idea:execution-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:lvcs-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/editor-ui-api[module]", "//tools/idea/platform/platform-api[module]", "//tools/idea/.idea/libraries:Guava", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/base/apkparser/analyzer:studio.analyzer[module]", "//tools/base/common:studio.common[module]", "//tools/base/apkparser:studio.binary-resources[module]",
diff --git a/build-common/BUILD b/build-common/BUILD index 555b3bf..30da575 100644 --- a/build-common/BUILD +++ b/build-common/BUILD
@@ -7,6 +7,19 @@ resources = ["resources"], tags = ["managed"], test_resources = ["testResources"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order @@ -23,6 +36,12 @@ "//tools/base/sdklib:studio.sdklib", ], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/util[module]", "//tools/adt/idea/android/lib:jarutils",
diff --git a/designer/BUILD b/designer/BUILD index 4873ca1..f8f59b7 100644 --- a/designer/BUILD +++ b/designer/BUILD
@@ -12,18 +12,29 @@ tags = ["managed"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/editor-ui-api[module]", "//tools/idea/platform/core-api[module]", "//tools/idea/platform/platform-api[module]", "//tools/adt/idea/android[module]", "//tools/idea/xml/xml-psi-api[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:lang-impl[module]", "//tools/base/pixelprobe:studio.pixelprobe[module]", + "//tools/idea:images[module]", "//tools/base/annotations:studio.android-annotations[module]", "//tools/idea/.idea/libraries:jsr305", + "//tools/idea:dom-openapi[module]", "//tools/idea/platform/lang-api[module]", "//tools/idea/.idea/libraries:layoutlib", + "//tools/idea:xml-psi-impl[module]", "//tools/idea/java/java-psi-impl[module]", "//tools/idea/java/java-indexing-api[module]", "//tools/adt/idea/adt-ui[module]", @@ -67,6 +78,13 @@ "//tools/idea/java/jdkAnnotations", "//tools/idea/java/mockJDK-1.7", ], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:json", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], test_srcs = ["testSrc"], test_tags = [ "slow", @@ -77,21 +95,23 @@ visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", "//tools/idea/.idea/libraries:mockito[test]", "//tools/adt/idea/designer[module, test]", "//tools/adt/idea/android[module, test]", "//tools/idea/xml/xml-psi-api[module, test]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/idea/.idea/libraries:truth[test]", "//tools/idea/platform/lang-api[module, test]", "//tools/idea/.idea/libraries:layoutlib[test]", + "//tools/idea:xml-psi-impl[module, test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/adt/idea/adt-ui[module, test]", "//tools/base/pixelprobe:studio.pixelprobe[module, test]", "//tools/adt/idea/android-test-framework[module, test]", "//tools/analytics-library/tracker:analytics-tracker[module, test]", "//tools/analytics-library/protos:analytics-protos[module, test]", + "//tools/idea:dom-openapi[module, test]", "//tools/analytics-library/shared:analytics-shared[module, test]", "//tools/adt/idea/adt-branding[module, test]", "//tools/adt/idea/sdk-updates[module, test]",
diff --git a/gradle-dsl-parser/BUILD b/gradle-dsl-parser/BUILD index 73a35b7..2550edd 100644 --- a/gradle-dsl-parser/BUILD +++ b/gradle-dsl-parser/BUILD
@@ -4,21 +4,29 @@ name = "gradle-dsl-parser", srcs = ["src"], iml_files = ["gradle-dsl-parser.iml"], - tags = ["managed"], - test_class = "com.android.tools.idea.gradle.dsl.GradleDslParserTestSuite", - test_runtime_deps = [ + manual_test_runtime_deps = [ "//tools/adt/idea/android-plugin", ], + tags = ["managed"], + test_class = "com.android.tools.idea.gradle.dsl.GradleDslParserTestSuite", test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/core-api[module]", "//tools/adt/idea/android[module]", "//tools/idea/plugins/groovy/groovy-psi[module]", "//tools/adt/idea/android-common[module]", "//tools/idea/platform/platform-api[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", "//tools/adt/idea/android-test-framework[module, test]", "//tools/idea/.idea/libraries:truth[test]", "//tools/idea/.idea/libraries:mockito[test]",
diff --git a/jps-plugin/BUILD b/jps-plugin/BUILD index 48de55d..86db84a 100644 --- a/jps-plugin/BUILD +++ b/jps-plugin/BUILD
@@ -5,10 +5,30 @@ srcs = ["src"], iml_files = ["android-jps-plugin.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], test_tags = ["manual"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + "//tools/idea/java/java-runtime", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/build-common[module]", "//tools/adt/idea/rt:android-rt[module]", @@ -20,6 +40,6 @@ "//tools/idea/jps/model-impl:jps-model-impl[module]", "//tools/idea/plugins/maven/jps-plugin:maven-jps-plugin[module, test]", "//tools/base/build-system:studio.manifest-merger[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", ], )
diff --git a/kotlin-integration/BUILD b/kotlin-integration/BUILD index 996eec1..88d671c 100644 --- a/kotlin-integration/BUILD +++ b/kotlin-integration/BUILD
@@ -17,20 +17,30 @@ "//tools/base/templates", "//tools/idea:platform-build-info", ], + test_runtime_deps = ["//tools/idea/plugins/maven:maven2-server-impl"], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/adt/idea/adt-branding", + "//tools/idea/.idea/libraries:KotlinJavaRuntime", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:xdebugger-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:lvcs-impl", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/android[module, test]", "//tools/idea/uast/uast-common[module, test]", "//tools/idea/java/openapi[module, test]", "//tools/adt/idea/android-test-framework[module, test]", "//tools/idea/java/java-psi-impl[module, test]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/adt/idea/android-plugin[module, test]", "//tools/base/testutils:studio.testutils[module, test]", - "//tools/adt/idea/adt-branding[module]", - "//tools/idea/.idea/libraries:KotlinJavaRuntime", "//tools/adt/idea/adt-testutils[module, test]", ], )
diff --git a/layoutlib/BUILD b/layoutlib/BUILD index 3447d16..ea3c08f 100644 --- a/layoutlib/BUILD +++ b/layoutlib/BUILD
@@ -11,9 +11,28 @@ iml_files = ["layoutlib.iml"], resources = ["resources"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], visibility = ["//visibility:public"], exports = ["//tools/idea/.idea/libraries:layoutlib"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/.idea/libraries:layoutlib", "//tools/base/sdk-common:studio.sdk-common[module]",
diff --git a/observable-demo/BUILD b/observable-demo/BUILD index 6d09644..7ffac50 100644 --- a/observable-demo/BUILD +++ b/observable-demo/BUILD
@@ -5,13 +5,32 @@ srcs = ["src"], iml_files = ["observable-demo.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/observable[module]", "//tools/adt/idea/observable-ui[module]", "//tools/adt/idea/adt-ui[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/idea/platform/platform-api[module]", "//tools/idea/.idea/libraries:Guava", ],
diff --git a/observable-ui/BUILD b/observable-ui/BUILD index 82231ec..8bc8c07 100644 --- a/observable-ui/BUILD +++ b/observable-ui/BUILD
@@ -5,12 +5,31 @@ srcs = ["src"], iml_files = ["observable-ui.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/adt-ui[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/adt/idea/observable[module]", "//tools/idea/platform/platform-api[module]", "//tools/idea/.idea/libraries:JUnit4[test]",
diff --git a/observable/BUILD b/observable/BUILD index 6ff7757..58780c8 100644 --- a/observable/BUILD +++ b/observable/BUILD
@@ -5,6 +5,22 @@ srcs = ["src"], iml_files = ["observable.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order @@ -13,6 +29,6 @@ "//tools/idea/platform/annotations[module]", "//tools/idea/.idea/libraries:truth[test]", "//tools/idea/.idea/libraries:JUnit4[test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", ], )
diff --git a/perfd-host/BUILD b/perfd-host/BUILD index 3ec5a1f..626a02a 100644 --- a/perfd-host/BUILD +++ b/perfd-host/BUILD
@@ -6,14 +6,33 @@ iml_files = ["perfd-host.iml"], tags = ["managed"], test_resources = ["testData"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/base/annotations:studio.android-annotations[module]", "//tools/idea/.idea/libraries:Trove4j", "//tools/idea/platform/platform-api[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/idea/.idea/libraries:JUnit4[test]", "//tools/base/common:studio.common[module]", "//tools/idea/.idea/libraries:truth[test]",
diff --git a/profilers-android/BUILD b/profilers-android/BUILD index ea1e1f7..e7e2d69 100644 --- a/profilers-android/BUILD +++ b/profilers-android/BUILD
@@ -8,6 +8,14 @@ test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/core-api[module]", "//tools/idea/platform/platform-api[module]", @@ -23,8 +31,9 @@ "//tools/adt/idea/android-common[module]", "//tools/idea/.idea/libraries:mockito[test]", "//tools/idea/platform/lang-api[module]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:lang-impl[module]", "//tools/base/ddmlib:studio.ddmlib[module]", + "//tools/idea:platform-impl[module]", "//tools/analytics-library/protos:analytics-protos[module]", "//tools/analytics-library/tracker:analytics-tracker[module]", "//tools/base/flags:studio.flags[module]",
diff --git a/profilers-ui/BUILD b/profilers-ui/BUILD index fb72c2b..860ba14 100644 --- a/profilers-ui/BUILD +++ b/profilers-ui/BUILD
@@ -6,9 +6,28 @@ iml_files = ["profilers-ui.iml"], tags = ["managed"], test_data = glob(["testData/**"]), + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/profilers[module]", "//tools/idea/platform/annotations[module]",
diff --git a/project-system-gradle/BUILD b/project-system-gradle/BUILD index 4ea2569..0ef1c1f 100644 --- a/project-system-gradle/BUILD +++ b/project-system-gradle/BUILD
@@ -8,6 +8,14 @@ tags = ["managed"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/platform-api[module]", "//tools/adt/idea/project-system[module]", @@ -25,6 +33,13 @@ iml_files = ["project-system-gradle-tests.iml"], tags = ["managed"], test_class = "com.android.tools.idea.projectsystem.GradleProjectSystemTestSuite", + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:json", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order @@ -33,7 +48,7 @@ "//tools/adt/idea/project-system[module, test]", "//tools/adt/idea/project-system-gradle[module, test]", "//tools/adt/idea/android-test-framework[module, test]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:mockito[test]", "//tools/idea/.idea/libraries:truth[test]",
diff --git a/project-system/BUILD b/project-system/BUILD index bdb4923..7087ae5 100644 --- a/project-system/BUILD +++ b/project-system/BUILD
@@ -6,12 +6,31 @@ srcs = ["src"], iml_files = ["project-system.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/platform-api[module]", "//tools/idea/.idea/libraries:Guava", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/base/common:studio.common[module]", "//tools/idea/platform/annotations/common:annotations-common[module]", "//tools/base/sdk-common:studio.sdk-common[module]", @@ -22,12 +41,22 @@ name = "project-system-tests", iml_files = ["project-system-tests.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:json", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:external-system-impl", + "//tools/idea:execution-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea:platform-impl_and_others[module]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/idea/.idea/libraries:truth[test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/adt/idea/project-system[module, test]",
diff --git a/sdk-updates/BUILD b/sdk-updates/BUILD index 01dfd24..ed32b7b 100644 --- a/sdk-updates/BUILD +++ b/sdk-updates/BUILD
@@ -7,8 +7,16 @@ tags = ["managed"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module]", "//tools/adt/idea/android[module]", "//tools/idea/platform/lang-api[module]", "//tools/analytics-library/tracker:analytics-tracker[module]", @@ -31,12 +39,19 @@ "//tools/adt/idea/android/testData", "//tools/base/templates", ], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:json", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ "//tools/adt/idea/sdk-updates[module, test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:testFramework[module, test]", "//tools/base/repository:studio.repository[module, test]", "//tools/base/sdklib:studio.sdklib[module, test]", "//tools/adt/idea/android[module, test]",
diff --git a/smali/BUILD b/smali/BUILD index 813905a..41f92fd 100644 --- a/smali/BUILD +++ b/smali/BUILD
@@ -11,13 +11,28 @@ resources = ["resources"], tags = ["managed"], test_class = "com.android.tools.idea.smali.SmaliTestSuite", + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:json", + "//tools/idea:external-system-impl", + "//tools/idea:execution-impl", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/idea/platform/platform-api[module]", - "//tools/idea:platform-impl_and_others[module]", - "//tools/idea:compiler-impl_and_others[module]", + "//tools/idea:lang-impl[module]", + "//tools/idea:testFramework[module, test]", + "//tools/idea:compiler-impl_and_others[module, test]", "//tools/idea/.idea/libraries:mockito[test]", "//tools/base/testutils:studio.testutils[module, test]", "//tools/idea/.idea/libraries:truth[test]",
diff --git a/uitest-framework/BUILD b/uitest-framework/BUILD index a52308f..1339ffc 100644 --- a/uitest-framework/BUILD +++ b/uitest-framework/BUILD
@@ -8,20 +8,31 @@ test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/base/common:studio.common[module, test]", "//tools/adt/idea/android[module]", "//tools/idea/platform/platform-api[module, test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module, test]", "//tools:fest-swing[module, test]", "//tools/idea/.idea/libraries:jsr305[test]", "//tools/idea/.idea/libraries:truth[test]", + "//tools/idea:testFramework[module, test]", "//tools/idea/plugins/gradle[module, test]", "//tools/idea/java/compiler/openapi:compiler-openapi[module, test]", "//tools/idea:java-impl[module, test]", "//tools/idea/java/openapi[module, test]", "//tools/idea/platform/testRunner[module, test]", "//tools/idea/platform/bootstrap[module, test]", + "//tools/idea:xdebugger-impl[module, test]", + "//tools/idea:dom-openapi[module, test]", "//tools/adt/idea/android/lib:spantable[test]", "//tools/adt/idea/adt-ui[module, test]", "//tools/adt/idea/designer[module, test]",
diff --git a/updater-ui/BUILD b/updater-ui/BUILD index 9e16696..5619f39 100644 --- a/updater-ui/BUILD +++ b/updater-ui/BUILD
@@ -7,6 +7,14 @@ tags = ["managed"], visibility = ["//visibility:public"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:json", + "//tools/idea:relaxng", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea/plugins/maven:maven2-server-impl", + ], + # do not sort: must match IML order deps = [ "//tools/idea/updater[module]", "//tools/base/repository:studio.repository[module]",
diff --git a/wizard-model/BUILD b/wizard-model/BUILD index 32c094a..9c58b45 100644 --- a/wizard-model/BUILD +++ b/wizard-model/BUILD
@@ -6,6 +6,22 @@ iml_files = ["wizard-model.iml"], tags = ["managed"], test_class = "com.android.tools.idea.wizard.WizardModelTestSuite", + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], # do not sort: must match IML order
diff --git a/wizard/BUILD b/wizard/BUILD index b8cc637..1e96d70 100644 --- a/wizard/BUILD +++ b/wizard/BUILD
@@ -5,19 +5,38 @@ srcs = ["src"], iml_files = ["wizard.iml"], tags = ["managed"], + # do not sort: must match IML order + test_runtime_deps = [ + "//tools/idea:RegExpSupport", + "//tools/idea:xml-analysis-impl", + "//tools/idea:testExtensions", + "//tools/idea:lvcs-impl", + "//tools/idea:xml", + "//tools/idea:spellchecker", + "//tools/idea:relaxng", + "//tools/idea:json", + "//tools/idea:images", + "//tools/idea:xdebugger-impl", + ], test_srcs = ["testSrc"], test_tags = ["manual"], # no tests visibility = ["//visibility:public"], # do not sort: must match IML order exports = ["//tools/adt/idea/wizard-model"], # do not sort: must match IML order + runtime_deps = [ + "//tools/idea:credential-store", + "//tools/idea:configuration-store-impl", + "//tools/idea:built-in-server", + ], + # do not sort: must match IML order deps = [ "//tools/adt/idea/wizard-model[module]", "//tools/adt/idea/observable[module]", "//tools/idea/platform/platform-api[module]", "//tools/idea/.idea/libraries:Guava[test]", "//tools/adt/idea/adt-ui[module, test]", - "//tools/idea:platform-impl_and_others[module]", + "//tools/idea:platform-impl[module, test]", "//tools/adt/idea/observable-ui[module]", ], )
